Merge "Hiding the icon of notifications that were replied to" into pi-dev
am: d018bc4346

Change-Id: Ieb2d44f76ee2b3624e1b30c5c0a381e7774e8591