Issue #2914484 by tim.plunkett, larowlan, xjm: Prevent the layout field from being removed if overrides exist