Attempt to save and restore expanded state

Change-Id: I64956410fb389d8e880979a84b51321d8b372217