Merge "fix missing dim layer surface"