36e3953538
The ub-launcher3-qt-future-dev branch cut missed the CLs that went into ub-launcher3-master, so the merge failed Change-Id: I4f6f5ca8323350af3bc84c72d61d935b36f8064f