Merge "composer: return pending config changes" into qt-r1-dev