Fixing merge into ub-launcher3-master

Change-Id: Ifd9128c72f6e11855b1bb9272c6f193d688ba021