Merge "Revert^2 "Do not need to startDiscovery if a bound device need to be assoicated."" into main