Merge "Be the current user to get A2DP proxy" into pi-dev