Merge "Reset side stage position after child task vanishes" into main