DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE am: d9a2be8d3d  -s ours am: 634221adb2 am: 54919264d8
am: 8d19637651  -s ours

* commit '8d19637651d03fee04ad2b0e56d5a5502ab0c23e':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE