am 4af206a6: Merge change Ia964056a into eclair-mr2

Merge commit '4af206a6f656a27cfd4004241e1b84e05489eb94' into eclair-mr2-plus-aosp

* commit '4af206a6f656a27cfd4004241e1b84e05489eb94':
  Revert "Do not allow javascript to change window focus."