Merge "Fix resize frame for widgets added with tap-to-add button" into main