Merge "Preserve order of shared items in preview" into udc-dev