Merge "Move showing keyguard after the UserSwitchObservers." into 24D1-dev