Merge "camera2 api: marshal rect, size, string for metadata"