Merge "Convert SettingsLib Lifecycle to Flatfoot"