Merge change 8077 into donut

* changes:
  Implement the Back button handler to save a VPN.