Merging from ub-launcher3-qt-future-dev @ build 6018744
am: 9734f74141

Change-Id: I1dea2264ec2ff11ae8938dadbac300288c2e5e61