Merge "Part 1: Tweaking history transition to match design."