Merge "Return from onUserUnlocked if user is no longer unlocked" into nyc-dev