Merge "Improve internal state synchronization of the A2dpStateMachine" into oc-dev