Merge "Close scan screen when pairing and remove device when unpairing." into honeycomb