Merge "Change usages of flags within bouncer to consider both compose bouncer and scene container framework flags" into main