Merging ub-launcher3-qt-dev, build 5582981 am: 90eb08d838
am: 8e0fa1ebbb

Change-Id: I6235d87bade78728e4820c390d83a3818950355f