Merge "AVRCP: Fix NPE in removeMediaController"