Merge "Use correct synchronization lock" into nyc-dev