Merge "Fail immediately if bindService() is passed a null ServiceConnection"