Merge "Fixed some issues when expanding from the launcher" into qt-r1-dev