Merge "Fix Clear Credentials item"