am 6d7958ab: Fix an out-of-sync bug in notification side channeling

* commit '6d7958ab7712efa7d6aece311208e4f2d43c1886':
  Fix an out-of-sync bug in notification side channeling