Merge "Reduce locking duration when checking idle states" into nyc-dev