Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev