Merge "camera2: Add support for secondary surface for stream"