[release/23.7] Fix variable product selector navigation - pull into release

[release/23.7] Fix variable product selector navigation - pull into release #18325