Merge "Introduce StrictModePreferenceController"