Merge changes I173f66fa,Iaa714f51 into qt-dev

* changes:
  WifiController: Minor cleanups
  WifiController: Defer broadcast registration
tree: e12f17d377d65cbc4a4d683d40122d0a519800a3
  1. service/
  2. PREUPLOAD.cfg