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

Change-Id: Ie258f2fa4d31c5af4c54f7caad54c0d85d1eb7aa