Merge "Revert "[DO NOT MERGE] Handle config override via settings correctly"" into qt-dev am: f61e5f2410
am: 52276d7e0f

Change-Id: Ieee84ec2287eb400ecbb41937ab459deafdf8fb1