Merge "TimeStats & FrameTracer: refactor layerID to layerId"