Merge "Push unlocking/unlocked state to UserManager" into nyc-dev