Merge "AVRCP: synchronize around mMediaController"