Merge "SettingsLib: Always update preference state." into nyc-dev