Develop 2021 release wave2

[jkanschik]

Type of change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Other (updates to documentation, formatting, etc.)

Description

This pull requests changes the Grid handling to accomodate for changes in ReleaseWave2.

Issues addressed

Fixes issue #1216
Also relates to #1229

All submissions:

• My code follows the code style of this project.
• Do existing samples that are effected by this change still run?
• I have added samples for new functionality.
• I raise detailed error messages when possible.
• My code does not rely on labels that have the option to be hidden.

Which browsers was this tested on?

• Chrome
• Firefox
• IE
• Edge

[ghost]

Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

❌ jkanschik sign now
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[adambarath]

Any update on this? @jkanschik @AmarSinghMSFT @ronigam

[Shakevg]

jkanschik Please fix merge conflicts or cancel if it is not actual