Merge "UI change in caption preferences in Settings" into qt-r1-dev