Merge "Camera: Add a new tag for multi-resolution stream support" into sc-dev