Merge "Avoid bad animation states." into rvc-dev