Merge "Ensure notification is attached before checking its channel." into main