Merge branch 'ub-launcher3-master' Bid: 5114212

Test: will rely on presubmit
Change-Id: I6107b6f87de2eaaf83a0a17407813a5fa5704f3f