Merge "Modified text field arrow tests for different input devices" into oc-dev