am f833fefb: Merge "Don\'t load items which exceed the grid bounds" into jb-ub-now-kermit

* commit 'f833fefb50e0eeae586cd66584b13ae299c0acea':
  Don't load items which exceed the grid bounds