Merge "Create the notification before registering the callback and add a null check logic." into main