Merge "Fix dangling pointer when device closed just after opening." into honeycomb-mr1