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

Change-Id: I99e6bbf20307141923bd9c09c3d86ec88fed62c5