Don't update OPTION fields if their SELECT wrapper is focused

This commit includes a port of the old Spark "control" tests,
which uncovered this bug.