Merge "Add traces to aid onScreenTuringOn latency debugging" into tm-dev