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

Change-Id: Iacff2d56b534c929fdde1828239a0b200cff188f