am 27912dfd: am e6b0282a: am a2681383: am acace94c: Fix race condition by guarding callbacks

* commit '27912dfd866f2631803a35c1ec47b6f31f8d2054':
  Fix race condition by guarding callbacks