[automerger skipped] Merge "Add footer preference into caption preferences"...
[automerger skipped] Merge "Add footer preference into caption preferences" into qt-r1-dev am: 5fc6db2c
am: 08be6c4a -s ours
am skip reason: change_id I95e0aa301eba7343fbc798cc406c0242f4f4eb7e with SHA1 8f4b8b9a is in history
Change-Id: Ic3153cef6f388c59f30a283cc47db435c774ab73