Merge "CentralSurfacesImpl#onStatusBarWindowStateChanged check for correct flag" into main