Merge "Camera: Update surface sharing format restrictions" into pi-dev