Merge "AVRCP: Reset mActivePlayerId on cleanup"