Merge "Fix expanded state bug" into sc-dev