Merge "GesturesSettingPreferenceController to Toggle" into pi-dev