Merge change I0c4cec7e into eclair

* changes:
  Attempt to fix [2152536] ANR in browser