Merge "SF: add trace for ExpensiveRendering" into tm-dev