Merge "SF TimeStats: fix a display on time logic bug"