Merge "Fix NPE for animate frozen snapshot" into sc-v2-dev