Merge "StatusBarConnectedDisplays: fix unit tests that fail when flag is ON" into main