Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread