Merge change 20423

* changes:
  Retain state of wifi connection after restore