Merging ub-launcher3-qt-dev, build 5565340 am: 662f12fe62 am: 907b521695
am: 1555c5af87

Change-Id: Ic2791f52ab68644753dc7cbaf303a4c34ae1e4b4