Merge "Revert "Use destroy in transaction for animation""