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

Change-Id: Ifda89a7872f0873a5443fdfcf52220182bf90e6c