Merge "Cancel existing preview item animation during non-animated update." into sc-dev