Merge "Add footer preference into caption preferences" into qt-r1-dev
am: 5fc6db2cf7

Change-Id: I02eb493be2b958b766f06d85dde7aabcc1230a68