Merge "Add contender method for lock contention" into nyc-dev