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

Change-Id: Ieae2e96acac3f1372d4075145426065f666a221a