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