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