Revert "Revert "Lock waitForStateChange()""
6 files changed