Always use cursor detection for improved test stability

Change-Id: I3ac7a8b404da907fbe025b2ab1af03dd7c32813e