am cc947fdc: Merge "Add window leak check and possible recovery." into jb-mr2-dev

* commit 'cc947fdc2decb83a70484bd0f831c58cc0346657':
  Add window leak check and possible recovery.