Merge "AVRCP: Fix NPE in removeMediaController" into oc-dev