Merge "Support Ctrl-based EditText movement."