Merge changes Ib3e373c2,Ia5d6f545 into ub-launcher3-qt-r1-dev
am: 1343f03e2e

Change-Id: Ie3f4c2c15e331c84f0f048c6337ae4e58111ec56