Merge "Camera: DistortionMapper: Fix to work consistently" into pi-dev