Merge "surfaceflinger: fix duplicate layer name logspam"