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

Change-Id: I2dc9dbb202c5f29213818d3541dbe81bdee0baed