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

* commit '54919264d8ab758a29c6d417d7bcd5a949c0b6e9':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE