Merge "Update settings PrimarySwitchPreference reference"