post merge fix: grid.js
post merge fix: cancel lazy-loading
post merge fix: remove uses of CLASS_WHEN_SHOWING_SHORTCUTS in Brain.js
Fixed some TypeErrors

* Syntax errors
* Missing variable declarations
* Duplicate variable declarations