Merge 3.6.0 back to `develop` branch

[vmarta]

Now that v3.6.0 is released, let's merge it back to the develop branch. This PR also bumps up the versions to the next minor/dev version:

@salesforce/commerce-sdk-react v2.1.0-dev packages/commerce-sdk-react
@salesforce/pwa-kit-create-app v3.7.0-dev packages/pwa-kit-create-app
@salesforce/pwa-kit-dev        v3.7.0-dev packages/pwa-kit-dev
@salesforce/pwa-kit-react-sdk  v3.7.0-dev packages/pwa-kit-react-sdk
@salesforce/pwa-kit-runtime    v3.7.0-dev packages/pwa-kit-runtime
@salesforce/retail-react-app   v3.1.0-dev packages/template-retail-react-app

Types of Changes

• [ ] Bug fix (non-breaking change that fixes an issue)
• [ ] New feature (non-breaking change that adds functionality)
• [ ] Documentation update
• [ ] Breaking change (could cause existing functionality to not work as expected)
• [ ] Other changes (non-breaking changes that does not fit any of the above)

Breaking changes include:

• Removing a public function or component or prop
• Adding a required argument to a function
• Changing the data type of a function parameter or return value
• Adding a new peer dependency to package.json

Changes

• (change1)

How to Test-Drive This PR

• (step1)

Checklists

General

• [ ] Changes are covered by test cases
• [ ] CHANGELOG.md updated with a short description of changes (not required for documentation updates)

Accessibility Compliance

You must check off all items in one of the follow two lists:

• [ ] There are no changes to UI

or...

• [ ] Changes were tested with a Screen Reader (iOS VoiceOver or Android Talkback) and had no issues
• [ ] Changes comply with WCAG 2.0 guidelines levels A and AA
• [ ] Changes to common UI patterns and interactions comply with WAI-ARIA best practices

Localization

• [ ] Changes include a UI text update in the Retail React App (which requires translation)