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

Change-Id: I56672b790213ccef54e290a7ff138851f3982f77