Merging  ub-launcher3-qt-dev, build 5505393 am: d4e8bdbc62
am: 1d79362f5c

Change-Id: I1cfcd20fa01fabc762216fbc9ce7da1b978b9847