Merge "Optimized onUnlockUser" into nyc-mr1-dev