Merge changes from topic "cherrypicker-L42100000956041116:N02800001288713842" into tm-qpr-dev

* changes:
  Tidy up VPN code
  Improve the code of handleSessionLost()