Merge "Fix layer Z dump"