Merge pull request from dshukertjr/fix/hero Fix hero animation on iOS