Merging from ub-launcher3-qt-future-dev @ build 6048032 am: 60fce03ac4

Change-Id: Ib390161ac41dc2854d1e622e8f759b2545657a96