Merge "Disable new avrcp on car devices" into pi-dev