Merging ub-launcher3-qt-dev, build 5565340 am: 662f12fe62
am: 907b521695

Change-Id: Iad21a74684cbcded93f74b323d5911cf1c783bfc