Merge branch 'stable-3.2'

* stable-3.2:
  Revert "Get a URI lock before running tasks."

Change-Id: I855a004147fd895f51b4349bb368cb9ae6a63060