[automerger skipped] Merge "UI change in caption preferences in Settings" into...
[automerger skipped] Merge "UI change in caption preferences in Settings" into qt-r1-dev am: af447c17
am: 42f6f192 -s ours
am skip reason: change_id Icb4dabdef71be165a21d1bde474872ee0bb35bfa with SHA1 fd1f1c0f is in history
Change-Id: Iae29b42f2804fd6efd40f1b9625fa81d7a133b75