Merging ub-launcher3-qt-dev, build 5633311 am: a3ed49d566
am: 83070095a5

Change-Id: I48e388a9e44115000556d107b04a35810cbae7a5