Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev