Merge "Eagaly update data in onUserUnlocking() and onUserStopped()" into main