Merge branch 'ub-launcher3-edmonton-polish' into pi-dev

Bug: 110425849
Bug: 80134723
Test: manual
Change-Id: I0cf89a4ee08ff2a36e5a586f7e0c04ae970bf13c