Merge timelines together when timeline is collapsed

Test: N/A
Change-Id: I48b5bbd45265681e0c515fa0138de4c6711f79f7
1 file changed