Merge "Fix: Cursor can be at an invalid offset in EditText."