Merge "UI change in caption preferences in Settings"