Girish's work on config detect in fullscreen branch carried over