Merge "Drop task snapshot with invalid hw buffer" into tm-dev