Merge "Let BubbleTextHolder extend IconLabelDotView" into tm-dev