Merge "Fix latency tracking for fold to screenoff case" into main