Cherry-pick fail.
Fixed issue with mobile nav choosing the last option by default. Fixes #950.