Merge branch 'ub-launcher3-dorval-polish2' into 1003

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