Merge "Bug 5596 Changes when closing device"