Merge "Merging ub-launcher3-qt-r1-dev, build 5718001" into qt-r1-dev am: 93bd85cf55
am: 72870bcddc

Change-Id: I63cee7f312dfeef1eda274bbddbfb676404a379a