Merge "Fix issue where widget resize frame overlaps widget (issue 6493388)"