Merge "Fix NPE when consuming snapshots for recent animation" into sc-v2-dev