Merge "Prevent setting expansion height to the current value" into main