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

Change-Id: I39e5958aa16ef5c9a27f3f31b11f1cf79b25d4f7