Merge "Prevent AsyncTask from creating too many threads Bug #10228005" into klp-dev