Merging ub-launcher3-qt-r1-dev, build 5782058 am: c128131a10
am: 530b284a90

Change-Id: I9fc9b85891806b7cf401fcc258162531c54b1e12