Merge "DarkUIPreferenceController null exception"