Merge "Remove unneccessary a2dpDeviceChanged variable"