Merge changes I173f66fa,Iaa714f51 into qt-dev

* changes:
  WifiController: Minor cleanups
  WifiController: Defer broadcast registration