Merge "Prevent arrow keys from leaving editable TextViews" into oc-dev