Merge "SurfaceControl: Crash due to invalid JNI cast"