am 0848874d: Fix an ANR

* commit '0848874dababf76873290985168e9bf3d51d9c5d':
  Fix an ANR