Using window to find reference to MTVNPlayer.
Merge branch 'hotfix/1.6.1'