Merge "Update JNI to pass SurfaceControls rather than handles to layer state updates"