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

Change-Id: Ida12f3415759b845d4f5e24322355b6d5920afcd