Merge "Move Settings atom enums to its own file."