Merge "move PreferenceController into settingLib/core"