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

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