Merging ub-launcher3-qt-qpr1-dev, build 5816382 am: 591ff9b8e7
am: 6bda30c1c5

Change-Id: I5781a3c7b939fe40d5c7f4121372953d9a55d752