Revert "Merge "HeadsUp: Correctly add and remove the window" into kk4.4-caf"

This reverts commit 7758a0dc95ef90170329ae6634aa9a522adc153c, reversing
changes made to 627088f216796703302f6c47b72eeda44251f009.