Merge "Keep deleteIntent when copying Notification attributes"