Merge changes I0b96f623,I019084a1 into ub-launcher3-qt-dev am: 503f46185a
am: 4ac2a3668b

Change-Id: I1bd8d25da249b44708a0a559d1cb9047f55bf753