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

Change-Id: Ie082601a7c3aa13a35d21dbd5295f169f6033d39