Merge "Adding user property for CrossProfileContentSharingStrategy." into main