Merge "Add scan interval and window lengths to Settings.Global." am: d3dac85e46
am: 8c33c789ed

Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1