Merge "Check SurfaceControl state while holding the WM lock" into main