merged ub-launcher3-dorval-polish, and resolved conflicts
Test: $ make -j 32 dist checkbuild

Bug: 30770233
Bug: 62896294
Change-Id: I032e6a6775bad0b3995750a43ff7ed6482cc2d5d