* Revert "Disable BlockGridEditor (#13229)" This reverts commit 4e9aa8dac2. * Re-do xml comments fix
4e9aa8dac2