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

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