Merging ub-launcher3-qt-qpr1-dev, build 5872416
am: a7a1b57bc8

Change-Id: I60dd1710d7c54e2e47b926453fd79a2c2031edd4