Merge "Add WM owners to SurfaceControlRegistryTests"