Merge "Do not sanitize override config for fullscreen" into nyc-dev