Merge "Add PrefController in XML support"