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

Change-Id: I93883fb366080585c6069266796335d0b98e1808