Merge "Camera2: Add distortion correction support" into pi-dev