Merge "Update SlicePreferenceController"