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

* commit '35bdda107fe76ab62087527946b201551ddfe965':
  Animate backlight quickly when display state request to change or power mode changed
  Make sure NaturalSurfaceLayout is consistent with SurfaceControl