Merge "Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev am: 526ab77a51 am: 1251085ac9" into qt-r1-dev-plus-aosp