Merge "Fixed an issue where the reply icon was disabled" into pi-dev