Merge "[DO NOT MERGE] Handle config override via settings correctly" into qt-dev am: 526ab77a51
am: d89a61cc34

Change-Id: Id4503843cd155203999f6eb97f6f7fed0590a669