Merge "Improve A2DP Bits handling" into main