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

Change-Id: I3e277511d94b6a121119c838bb7d3046e42c8d23