Merge branch 'ub-launcher3-master' into master

Bug: 73327733
Test: manual test
Change-Id: Id2211340155ebea35a2adc04b6f41237911e9856