Merge "Fix notification shell commands"