Merge branch 'ub-launcher3-edmonton' into pi-dev Bug: 80134723 Test: manual Change-Id: If8e9c1b1aacf547ab7a1edaccaa9fed5e976a980