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