Merge "Prevent arrow keys from leaving editable TextViews" into oc-dev am: 27b0a55fab
am: 523faba79a

Change-Id: Icfcc66ae6bd344464cc67f4db183a814e2644ce8