Merge "Fix TimeStats layerName for transactions" into sc-dev