Merge "Add validators for all Settings.Secure settings that are backed up"