am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev

* commit 'ac8c98614cb8260615795b2042699d93b21a1097':
  Notify settings URI change without a lock held