Merging ub-launcher3-qt-qpr1-dev, build 5816382

Test: Manual
Change-Id: Iddf826a79748b42eabab1cfa7768c2330045cf73