Merge "Restore deleted conversation channel on notification posted" into main