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

Change-Id: Ie5bec8ce708052beb8d96c8b388141092fe72ca1