Merge "Minor improvements on LocalPreferences."