Merge "fix incorrect selection highlight position with postive line spacing" into...