Merge "Do not call out of the settings provider with a lock held" into mnc-dev