#16298 this sould fix the issue and fix a test fails on https://githu…

[molneek]

…b.com/fratob85/magento2/tree/fix-switch-to-incorrect-store

Description

Fixed Issues (if relevant)

1. Magento sometimes doesn't select the correct store if the scope code is null #16298: Magento sometimes doesn't select the correct store if the scope code is null
2. Fixed PR https://github.com/fratob85/magento2/tree/fix-switch-to-incorrect-store

Manual testing scenarios

1. ...
2. ...

Contribution checklist

• Pull request has a meaningful description of its purpose
• All commits are accompanied by meaningful commit messages
• All new or changed code is covered with unit/integration tests (if applicable)
• All automated tests passed successfully (all builds on Travis CI are green)

[magento-engcom-team]

Hi @molneek. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

• @magento-engcom-team give me test instance - deploy test instance based on PR changes
• @magento-engcom-team give me {$VERSION} instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

[miguelbalparda]

Can you please check the failing tests?