Merge change I4961c959 into eclair

* changes:
  fix [2152536] ANR in browser