[automerger skipped] Merge "Added horizontal seperator in Face Settings" into...
[automerger skipped] Merge "Added horizontal seperator in Face Settings" into qt-qpr1-dev am: 30bf9e2e am: a0776037 -s ours
am skip reason: Change-Id I05bfa9b1826c5d4dfcbba6cbe2d2e320014950e3 with SHA-1 409a1c68 is in history
Change-Id: Ic73efc1ad35a4805f38264e55ed5dfd6e48b8aff