Merge "SurfaceControl: Fix captureLayers JNI"