Merge "DO NOT MERGE - Slightly better encapsulation for the set of recent activities" into nyc-mr2-dev