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

Change-Id: I85360ac3905277ff12fad31447a0833f9bc6d5da