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

Change-Id: Ib0f2717c125b37ca5327bb1662d668d39632ae5e