Merge "Handle multiple animation actions within one frame" into nyc-dev