Merge change 23974 into eclair

* changes:
  allow file: scheme in the browser