Merge "AVRCP Controller manage active device"