Merge "Clean up AssistGesturePreferenceController" into oc-mr1-dev