Merge "Preventing the hierarchy viewer from getting stuck, once when trying to...

Merge "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." into gingerbread