Merge "Fix to get A2DP to connect after unpairing" into gingerbread