Merge "SCO: Don't set active device if a diconnect message is defered" into pi-dev