Issue #2006288: Fixed problems with saving entities with newly disabled view modes and customized displays.