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

Bug: 74794600
Test: manual test
Change-Id: Id34a70abfa5de9dd741848efa3b82fae608c0df0
276 files changed