Merge "Prevent conflicting animations from starting." into rvc-dev