Merge "Save reentry fraction when animation is ignored" into rvc-dev