Merge "Trace Window relayout reasons" into tm-dev