WIP: CFD-204 - Activity stream: move  content callbacks

#204