Merge "Remove unused setting" into qt-r1-dev
am: 95a675ce91

Change-Id: Ia72e5c6625f8213c807966312550111bcbdcb767