Merge "Camera: Add MONOCHROME capability" into pi-dev