Merge change 9455

* changes:
  Close the "Please connect charger" alert after a charger is connected.