Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl"
am: 6fa9c5cd01

* commit '6fa9c5cd01e36c62d5ad7efa230d4e52f457c148':
  Make sure NaturalSurfaceLayout is consistent with SurfaceControl