Merge "Fix notification manager delete intent."