Merge changes I970ed009,I21868e9f

* changes:
  WifiScanningService: Handle emergency scan requests when disabled
  WifiScanningService: Refactor scan start/end mesage handling