Merge "SurfaceControl: Crash due to invalid JNI cast" into oc-dev