Merge "Add display switch latency tracking" into main