Merge "Ignore relative Z order if layer doesn't exist"