Merge "Merge "Fix strictmode error logs due to task snapshot hw buffer not being closed" into sc-dev am: 40902ab9 am: e2229dc0 am: a1b68a60"