Merge "Clear IMM references when window dismissed." into jb-dev