Merge remote-tracking branch 'goog/ub-launcher3-calgary' into HEAD