Bug 1018379 - Use wifi scanner as the sole the heartbeat that drives location updates, shorten the wifi scanner wait to 5s to ensure this (also stop and restart the scanner on WifiGeoPositionProvider.startup() to ensure this). r=jdm
Bug 1022279 - NetworkLocationProvider should respect wifi.enabled settings. r=kanru
Bug 1022283 - Increase the timeout value of the NetworkLocationProvider and clean up its usage. r=kanru
Bug 1022463 - Gonk GPS should default to 10s before trying a a network position. r=kanru