Merge "Make sure NaturalSurfaceLayout is consistent with SurfaceControl" am: 6fa9c5cd
am: 35bdda10
* commit '35bdda10':
Animate backlight quickly when display state request to change or power mode changed
Make sure NaturalSurfaceLayout is consistent with SurfaceControl