Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev