Merge "AVRCP: Workaround Queue ID & metadata updates"