Revert "d2/jf re-enable cancel_auto_focus"

This reverts commit 12a409106d3c7d04dd51936874f83b35bbc1455e.