Merging ub-launcher3-master, build 5192449

Test: Manual
Change-Id: I66ac8dfbc118536b2f0d5c9d096d474290e37a56