Merge branch 'ub-launcher3-master' into launcher3merge

Test: make -j31
Bug: 113128349
Change-Id: I632b4ab33469b1ca76466da8eba1e3b5a51728d3