Merge changes Ifd466d1e,I9f57651a

* changes:
  Don't set windowing mode in fullscreen displays.
  Only persist launch params on freeform display.