Merge "Correct status bar background on connected displays" into main