Merge "DO NOT MERGE Fix crash when device is null in Connection Access Cancel." into gingerbread