Merge "Merge "Add field to set A2DP device volume on connect (1/2)" into pi-dev am: d8e8126abe am: 695cc44f56"