Merge "Add @Nullable and @NonNull to new Notification API"