Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev