Merging ub-launcher3-qt-dev, build 5697268 am: a0967d21e6 am: 2ff91d6dde
am: 5354fe6333

Change-Id: I4627d24cbd166a029823c27543e26f191c992d0b