Merge commit '6947cc594276df899a0c4662224455f40846bd0a' into gingerbread-plus-aosp
* commit '6947cc594276df899a0c4662224455f40846bd0a':
Preventing the hierarchy viewer from getting stuck, once when trying to load the window data for SurfaceView and the Wallpaper, and in the case the captured node has disappeared.