Merge "Migrate some preference theme attributes from SettingsLib"