[automerger skipped] Merging from ub-launcher3-qt-future-dev @ build 6048032 am: 60fce03ac4
am: 478214d962 -s ours
am skip reason: change_id Ieee38cc301364f96cf252b2387142b0aa1b75317 with SHA1 e2fe62eea8 is in history

Change-Id: I02726345218ca0030b7ac9a3b5bb5681abb05b60