Merge "Fix resize frame drawing underneath content" into main