better checks for edit controls prevent false failures in IE in particular

Change-Id: I1260fc1c1085c17c923df5a0c886a60992f184cc
Merge "better checks for edit controls prevent false failures in IE in particular"