Merge "AVRCP: Fix EvictingQueue"