Merge "[Spa] Make the SuwScaffold content movable" into main