Merge "Set text for conversation notifications" into main