Merge "Call onDismissed on dismiss even mUserSwitchingDialog is null." into udc-dev