Merge "Preserve shade state on fold/unfold."