Merge "Fixed a leak of a notification when replying to a conversation" into pi-dev