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

Change-Id: I5d1d1d70a0936c4542d26f7f7216a2d6a66eb1e6