Merge "Fix crash in bindService due to uncleared binder identity"