Merge "Fix strictmode error logs due to task snapshot hw buffer not being closed" into sc-dev