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

Change-Id: Ic2edcd51c560231fb6a835dee50f0dc1cfa2b949