Merge changes I4532e429,I532645de into ub-launcher3-qt-future-dev
am: 478414a7c3

Change-Id: Ic9af7149c297e23fd8c3645fd0a83dd5f45e0cce