Merge "Rename createContentUriAsUser to createContentUriForUser" into sc-dev