Merge commit 'aa1d75e66a38efdce21e944b5ddbe42ad634480f' * commit 'aa1d75e66a38efdce21e944b5ddbe42ad634480f': Fix issue 2085911: Volume control is broken when A2DP headset is connected.