Merge "Fix NPE when removing widgets" into main