Merge "Remove temporarily Thread.onSpinWait usages for its revert"