Activity stream fixes and grouping of timeline activities