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