Merging from ub-launcher3-qt-future-dev @ build 6073465 am: af431d130c

Change-Id: Ia3bf6db2e067282d7d0d307cf09fe5eed05a9e85