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

Change-Id: Icfd53766387eb0543e98aa363374eb5454900770