Merging ub-launcher3-qt-dev, build 5508646
am: cd5ed8b28f

Change-Id: I9e4b869924389a4ae88d411f6cebf760174ebd78