Merge "Add some synchronization to hotspot callbacks" into nyc-dev