Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev