[automerger skipped] Merge "Remove unused setting" into qt-r1-dev am: 95a675ce91 am: d670c6c1f8
am: fb1d9de34d -s ours
am skip reason: change_id I5c4af200b0c61efb9a0f76d00c2f047d4880d77b with SHA1 499ff8a5ca is in history

Change-Id: I1be56c549ad4281be7994d6ae47f19ad1e8a1568