Merge changes I5b93af75,Idb05b6a6,I5bc42afb,I6694db49,Ib7aba464

* changes:
  Add unit tests for preferring bad wifi
  Add the notification for actively prefer bad wifi
  Clear notif upon bad wifi off + tests for bad wifi notif
  Detect captive portals as they are tested, not upon notifying
  Implement the "actively prefer bad wifi" feature