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