Merge "Revert "Migrate some preference theme attributes from SettingsLib""