am 2761ccd4: Merge "Retain expanded state across more than one violent update." into jb-dev

* commit '2761ccd4799971b7ad696f6f94036ca16113c78d':
  Retain expanded state across more than one violent update.