Merge "Refactor usage of synchronized inside A2dpService"