Merge "Add Intentfilter BasePreferenceController" into pi-dev