Merge "HeadsetClient: Return from stop() if not started"