Merge "Fix potential leakage of InputWindowHandle from display removal"