am 3838b611: Improved the notification stack logic further

* commit '3838b6116b72cce25b49ba7bbce63b7ac00820af':
  Improved the notification stack logic further