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

Change-Id: I1f3d067dcfd7994686a8cbf6a05f39655b4fd7e4