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

Change-Id: I482ace6717063630d3c5018c471601cfd21a2f19