Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev