Merge changes from topic "sharesheet-refactor"

* changes:
  Add URI shared by screenshot into extras.
  Re-patching in Sharesheet security model changes.