Merge "Ensure correct read of jpeg header blob" into tm-dev