Merge "Broadcast USER_INITIALIZE after user is unlocked" into nyc-dev