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

Change-Id: Ib27536f48a565716b43b49d7a69f968009087f13