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