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

Change-Id: Icf84ac47bc29a0d0d00dd93e6e65aeb26957e7dd