Merge changes I03e37561,I8f25255a into main

* changes:
  Move onBeforeUserSwitching call to the beginning of the user switch.
  Revert "Move showing keyguard after the UserSwitchObservers."