Merge "Move showing keyguard after the UserSwitchObservers." into main