Merge branch 'ub-launcher3-burnaby-nyc' into launcher3merge

b/28269144