Merge "Fix auto connection priority handling." into gingerbread