Merge changes I705b7a65,I98a2e71a into ub-launcher3-qt-dev
am: da9cf0f66b

Change-Id: I38f22c8c5d704b9e45174d63a1e2057c5c04e835