am: d9a2be8d -s ours * commit 'd9a2be8d': DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE