Merge "Retain expanded state across more than one violent update." into jb-dev