Merge "Merge "Camera: Add MONOCHROME camera capability" into pi-dev am: 889b21d181 am: aa306f2788"