am ec4d9040: Merge "Attempt to recover from apps destroying their window at...
am ec4d9040: Merge "Attempt to recover from apps destroying their window at draw time Bug #6436642" into jb-dev
* commit 'ec4d9040':
Attempt to recover from apps destroying their window at draw time Bug #6436642