Merge change I9861276c into eclair-mr2

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