Merging ub-launcher3-qt-dev, build 5697268 am: a0967d21e6 am: e303383f77
am: c894a3eec5

Change-Id: Ib92840e6e1ed5c71d2981d6981e211cc1b74825f