am 6500db1a: Merge "Forbid javascript- and file-scheme intents"

* commit '6500db1a3e369767e9fa3a0fc00bd5676b8f7041':
  Forbid javascript- and file-scheme intents