am 2584c31d: resolved conflicts for merge of 0570344a to jb-mr1-dev

* commit '2584c31de479fa27971455b1e70b8e58b754c0e9':
  Pass webview's useragent when downloading via context menu