Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev