Merge "Merging ub-launcher3-qt-r1-dev, build 5642992" into qt-r1-dev am: 013ff31649
am: a5af958da0

Change-Id: I2e4e8e9ae3d6043f8c99f92ea2c5397d9bc4ab1b