Merge "Refactor AppPreference & AppSwitchPreference"