Merge "Revert "Fix small gap between widget resize frame and widget background."" into main