Merge "Reset the expanded bubble after dismissing the stack" into main