Merge branch 'ub-launcher3-dorval-polish2'

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