Merge "Remove unnecessary animation" into rvc-dev