Merge "Revert "Camera VTS: Improve test for torch callback""