Merge change 6356

* changes:
  Add fullscreen support back in.