Fix like and mention notification. Manual cherry-pick of 466