Merge "Add field to set A2DP device volume on connect (2/2)"