Merging ub-launcher3-qt-dev, build 5691374
am: 5cd4333b5c

Change-Id: If3e5ca48b2e92cc1ae953affbbd162b8f96735a0