Merge "AVRCP: Fix NPE on adding non-browsable player"