[TIMOB-17394] Refactor to adjust for additive animations
Merge pull request #28 from vishalduggal/timob-17394

[TIMOB-17394] Refactor to adjust for additive animations