Merge "Fix timeline expansion"