Merge "Update status bar scrim" into main