Merge "Fix UI traces real-to-elapsed time offset"