Merge "Do not sanitize override config for fullscreen" into nyc-dev
am: 65f1973ba9

* commit '65f1973ba9f91c6727a7131b31b6c563cd880ee0':
  Do not sanitize override config for fullscreen

Change-Id: Ic9c62b12f529e17c39ac7f466433cb30cb13f356