Merging ub-launcher3-qt-qpr1-dev, build 5884665 am: 3adf6ff5a2
am: 7f29c5caf3

Change-Id: Ie2cba3b8078c2aaabcb2f49922f792cb94d3883e