Merge "Flexiglass: refactor StatusBarState calculation" into main