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