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

* commit '634221adb28f765233889cca32078e4b042198f3':
  DO NOT MERGE Revert ActivityView gets its own thread pool. DO NOT MERGE