Merge changes I50831d4e,I5360aebe

* changes:
  flatland: remove an unneeded #include
  libgui: disallow NULL Fence pointers