Merge "Add wipe on login failure to Privacy Settings page"