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

Change-Id: Ia0130d27fab963ede18e5970e3d1e6eff65efc16