Merge "Fix a timestamp bug in window transition."