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

Change-Id: Ied41d63d50033cb01b647abbf0f8f62139c3a901