Merging ub-launcher3-qt-r1-dev, build 5662440
am: 5cc6db47d9

Change-Id: I498f2d7faef774589efbc7322c01f680c0be6a48