Merge "Camera: use compact copy when necessary" into pi-dev