Merging ub-launcher3-qt-dev, build 5691374 am: 5cd4333b5c am: 989989668c
am: 1f4fe3b055

Change-Id: I3daffb00f4a7306359e63bf776cb55ba8465368c