Merge "Move DesktopVisibilityController to TouchInteractionService" into main