Merge changes I37d55b60,I350ec45b

* changes:
  Fixes connecting to service after setup finishes for other users
  Fixes service disconnect crash when changing users