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

Change-Id: I8d51cab4d66732ee69d2bb15a59381f10d6e7f1d