Merge "Flag to enable hiding the bubble overflow if it's empty" into main