layers: rename surface_id_to_layer and surface_id_to_layer_map