Merge "Fixed an issue where the reply icon was disabled" into pi-dev
am: 1c6b809579

Change-Id: Ib9593bdbf872a9146a877b3ec22c101001b2ad13