Merging ub-launcher3-qt-dev, build 5662436 am: 1461f48ef2 am: 1ff91077f3
am: 715a9dc26b

Change-Id: Ie5748d466d203d689f1f9b65bc03c088981215d3