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

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