Merge branch 'ub-launcher3-dorval-polish2'

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