Merge "Fix shimmy cold start jank" into gb-ub-photos-denali