Merge "Acquire the global lock of WM before calling updateConfigIfNeeded" into main