Merge "Camera: Add support for multi-resolution input and output streams" into sc-dev