Merge "Revert^2 "Update status bar scrim"" into main