Merge "Merge "Fixed a leak of a notification when replying to a conversation" into pi-dev am: ccefa79c07 am: 147350473e"