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

Change-Id: I41af3d723e3e68754c3dad3e58540924e31cb3cf