Merge change 27451 into eclair

* changes:
  Fix for the dual notification problem