Merge "Use the old ListSeperatorStyle for EditKinds" into lmp-dev