Merge "Fix leakage of input window handle on removed display"