Merging ub-launcher3-qt-dev, build 5642962
am: 0ea61abe10

Change-Id: I5fa3d425449ec15d45ace80f645a2df0ee6cca13