Merge "Fix NPE in BubbleTextView"