Merge change I3c9f79ba into eclair-mr2

* changes:
  Retain webview history when viewing Safety notices. Fixes #2160518