Resolve duplicate key issue on next branch

[CuriouslyCory]

Fixing same issue on "next" branch for 3.0.0-alpha release: Warning: Encountered two children with the same key, T. Keys should be unique so that components maintain their identity across updates. Non-unique keys may cause children to be duplicated and/or omitted — the behavior is unsupported and could change in a future version.