Merge "Reorder kThreadWaitLock"