Merge "Add a CategoryKey for Advanced Security Settings screen"