Merge changes I7414c278,I11c7ea70

* changes:
  Only wait for 8 seconds when T && !activelyPreferBadWifi
  Introduce an overlay for actively preferring bad wifi.