Merge "Change underlying preferenceControllers to an ArrayMap of Lists."