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

* commit '29a5e4a3831e5bd38552fae33801fe25f4042591':
  Retain expanded state across more than one violent update.