Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl"