Merge "Try BT audio connection one more time before failing"