Merge "Move UserController.dispatchOnBeforeUserSwitching to mHandler thread." into main