Merge "Fix NPE in BubbleTextView" into tm-dev