Merge "Fix EditText cursor when line spacing is set"