Merge "Converting DesktopVisibilityController to a singleton" into main