Merge "Revert "Close TaskSnapshot hardware buffer before remove from cache."" into 24D1-dev