Merge "SurfaceView: Fix null check on RemoteAccessibilityController"