[UX] Combine Permissions for `Field` and `Field UI`

On the Permissions matrix (admin/config/people/permissions) there is a section for Field and a section for Field UI that both contain permissions relating to the User Interface for Fields. Shouldn't the both be under Field or both under Field UI?

If the Administer fields permission comes from the Field module I recommend that we move the Display Mode permission there as well.