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

Change-Id: Ifddcba1cd63950424f88ad1d8e01fa9a11f73a2e