Merge "Move isFullyExpanded and isCollapsing" into main