Merge "Move legacy notification processing to Notification.Builder"