Merge "[flexiglass] Bouncer scene adaptive layout improvements." into main