Merge changes I790baf5e,I133f4861 into pi-dev

* changes:
  WifiStateMachinePrime: discard messages from old managers
  ModeManagers: do not report disabled when stopped