layers: Add state-dependent image aspect/format checks
6 files changed