Merging from ub-launcher3-qt-future-dev @ build 6099678 am: b676092514 am: c398eed9fd

Change-Id: I6ecbc183f7f39c086ab73164077fd8dc237cd0ae