Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev