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

Change-Id: Ifba958b43b6c4c13559d2ee0b0cb25f16b700d08