Merging ub-launcher3-qt-r1-dev, build 5662440
am: 7c4d224817

Change-Id: Idc89ce142842e2679e2711dd7d06077e3ab9084b