Merge "Fixed some issues when expanding from the launcher" into qt-r1-dev
am: 608c18bd27

Change-Id: I9e072dc5f17a4bd9c13e19aa48d41b42596d9361