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

Bug: 111438498
Bug: 80134723
Test: manual
Change-Id: If50f0cfd7ce02978eb0d2ab3a8d5e2c1550548c6