Merge "Re-fetch DesktopVisibilityController when needed instead of just once" into main