Merge "Refine strings for dangling notifications" into 24D1-dev