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

* commit '47797a765327af3d3688b6993d85e727ddcf4aa0':
  Do not sanitize override config for fullscreen

Change-Id: Ib531f36a2526d4d7b2f3c09ece16ca0bb745447f