Merge changes Ice7f8995,I7a788777 into qt-qpr1-dev

* changes:
  WifiNetworkFactory: Send match callback on registration
  WifiNetworkFactory: Use the latest cached scan results
tree: 55a777020b3bebf14242a05077e3af0a7d29984d
  1. service/
  2. PREUPLOAD.cfg