Merge changes from topic "sta-plus-sta-boot-time-regression"

* changes:
  Fix boot time regression
  Revert "Revert WifiController/ActiveModeWarden refactor due to boot time regression"
tree: 39775147f2628ef6de2468a524885b89d7464d33
  1. service/
  2. PREUPLOAD.cfg