Merge "Re-enable browsing support for AVRCP"