am baaf3ce6: Merge "Handle stopping of services with still bound applications."

* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
  Handle stopping of services with still bound applications.