Merge "Camera: Do not forward capture_result in error condition" into pi-dev