Issue #89: Fix image format logic switch statement falling through to default.
Issue #89: Preserve image format for non-dynamic layers.
Issue #89: Rename function that ensures known dynamic layer image formats.
Merge branch '#89/improve-image-format-handling' into develop