Merge "Fix notification's email button to close notification shade." into jb-dev