Merge changes I19124e59,I1a61f421

* changes:
  Save the last selected payment service
  Do not bind a service, if it has already been disconnected