DO NOT MERGE - Slightly better encapsulation for the set of recent activities
am: 6abecd2c2a

Change-Id: Iee98c0be053fbd8a83bb9a7c9cd464034ef86e56