Merge branch 'ub-launcher3-master' into pi-dev

Bug: 74794600
Test: manual test
Change-Id: Ic459d478266085ba7e4e3bdda010fcfbc2c22552