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

Change-Id: Ic0a9f2181e884b5de679f85351fe4179473838f2