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

Change-Id: I236ca11d2adfef5f23590c305f79b210f79d83bf