Merge "More efficient drawing during animation" into gb-ub-photos-denali