am 0058f4ed: Merge "Reset ExpandHelper when the panel is collapsed." into jb-mr1-dev

* commit '0058f4ed50e5b4bfc8361c18b87115160d7132bb':
  Reset ExpandHelper when the panel is collapsed.