Merge "overrideConfig should use existing notification flow for CCC" into qt-dev