Merge "Update BubbleTextView height to match parent so focus outline drawn could be fully displayed" into main