Merge "Fix comment in TransientBubbleStashControllerTest" into main