Merge "Flexiglass: include alternate bouncer in status bar state calculation" into main