Merge "[automerger skipped] Merge "Add Intentfilter BasePreferenceController" into pi-dev am: e7906cb910 am: f7fcdbda29  -s ours"