Merge "Remove unused setting" into qt-r1-dev