am c87b0084: Merge "Refactor animation code in new Draw() method into its own method."

* commit 'c87b0084e3dbf5c0862d29f039ee908bccf39e9d':
  Refactor animation code in new Draw() method into its own method.