Merge "Remove duplicate addition of preferences item"