Merge "SurfaceControl: Fix captureLayers JNI" into qt-dev