Add patch to fix html tags showing up in the /activity page

#5705