Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev