Merge change Ia964056a into eclair-mr2

* changes:
  Revert "Do not allow javascript to change window focus."