Merge "Move calling service.unregisterCallback() into unbindService()" into main