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

Change-Id: I3534ff5233545aba8dfccaef650bae35863fa50e