Merge "Merge "SurfaceControl: Fix captureLayers JNI" into qt-dev am: 242f2c93fa" into qt-dev-plus-aosp