Merge "Camera: fix errorFlag logic" into pi-dev