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

* commit 'f6504fceb9a37b543368be6e5d943b1981434b31':
  More efficient drawing during animation