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

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