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