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

Change-Id: I920fc80aa61b89814c5873339be744ea4c6af0b9