Merge "Add an extra to sharesheet's image edit intent" into udc-dev