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