Merge "Call unlockUserKey in a synchronized section" into nyc-dev