Merge "Migrate NLS access to preferencecontrollers"