Merge "Don't call the Package Manager when holding the settings lock" into oc-dev