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

Change-Id: I624913ae82d86920c2013bea175d95c32be07d1b