Merge "overrideConfig API did not notify platform correctly" into qt-dev
am: 52e05ac876

Change-Id: I4313348cc7442f083edcfbf1895baed1fa376731