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

* commit 'a9ee110cd955a57ecec725f1357711876a418d2c':
  Retain expanded state across violent updates.