Merge "OutOfband pairing user dialog." into gingerbread