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