Fix preparation of constraints to include preferred devices, and goog options
1.10.0