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

Change-Id: Ib8d928265129b78e23b2135ce7bb2a7894d9a580