am a2681383: am acace94c: Fix race condition by guarding callbacks

* commit 'a26813838015072999bf7f8c83b0be2dd5e1430b':
  Fix race condition by guarding callbacks