Merge "Don't clear size compat mode on fold/unfold." into sc-dev