Merge "Add highlight APIs into TextView and Layout"