Merge "Add more info to monitor contention logging" into nyc-dev