Merge "If we're adding / removing a bubble, don't forget to add the overflow" into main