am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev

* commit '1648f042f31df54c25a725c4c5ca2c852a10ef0e':
  Set the new SurfaceControl opaque flag.