Merge "Move #mSwitchingController to UserData" into main