Merge "Camera: Fix up torch strength keys." into tm-dev