Bug 1110872 - Readd cleanup for live locks in SettingsManager; r=gerard-majax