Merge "Add Intentfilter BasePreferenceController"