Building a back stack to the notification
Merge branch 'feature-backstack' into 124beta