Merge "Add flag for stashable bubbles" into main