Merge "Move collapse button to top of expanded timeline." into main