Merge "Fix issue 5381089: problem with A2DP music volume"