Merge "Back button dismisses notifications again." into jb-dev