Merge "Camera: various external camera fixes" into pi-dev