[TIMOB-17394] Refactor to adjust for additive animations

Fixes [TIMOB-17394](https://jira.appcelerator.org/browse/TIMOB-17394)