layout: add surface id to layer mapping