Merge "Fix Debugview keys not getting removed from screen" into main