Merge "Remove unused API removeFromSideStage" into main