First modifications to switch from using PackageName to UID as the identifier for settings.