Issue #3002941 by tim.plunkett, tedbow: New enabled View modes for bundle have duplicate fields in layout (cherry picked from commit 19513d5f)
