Merge "don't call settings provider with pkg mgr lock"