Merge "Check display id of the last hover window before it is cleared"