Merge "Always call unbindService no matter what bindService returns"