Merging ub-launcher3-qt-dev, build 5565340
am: 662f12fe62

Change-Id: Ib3d34a7370f0da285d795170dc755cac72adb1b2