Merge "Fix typo in Preference definition for Security Advanced Settings" into tm-dev