Merge "Refactor AppPreference and AppSwitchPreference"