Merge "SCO: Don't set active device if a diconnect message is defered"
am: 65c51c5973

Change-Id: I4da544932b6d9001163fd3ae0c17161b6fc5dfec