Merge branch 'ub-launcher3-dorval-polish2'

Bug: 64937210
Test: flashed img
Change-Id: I62116a7e4d105eeeeae25a86cfb07d61586c4ab2