Merge "Don't use WMS.mWindowMap to synchronize WM critical section (36/n)"