Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev