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

Change-Id: Id6e36648cde5aef16dbc80b3e78251e4532a7d27