am 89304586: Merge "Retain expanded state across violent updates." into jb-dev

* commit '8930458639527448429362255af96e94f5aba5ed':
  Retain expanded state across violent updates.