Merging ub-launcher3-qt-r1-dev, build 5800211 am: 26bf127983 am: d8ccc772c3
am: 9c0f711db6

Change-Id: Ia70c938b6c00f42075f8505a9a529777f079280b