Merge "Revert "Make sure userSwitchComplete is dispatched after screen is unfrozen.""