Merge "Add null check when resetting animation" into sc-dev