Merge "AVRCP: Fix concurrency issues with MediaController"