Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev