am f8e4bc9f: Merge change I0c4cec7e into eclair

Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-mr2

* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
  Attempt to fix [2152536] ANR in browser