Merge "Don't set non-FIXED_SPACE StatusBarIconViews to CENTER" into main