Blocks in fix for edit layer z-index management, needs tests.