Merge "Improve AVRCP quality and state handling (2/2)" into oc-dev