Merge "Do not crash DesktopVisibilityController on unknown displays" into main