am be8aa3a8: am 80e055ee: am efbe739a: am b8da744b: am 8ed3752f: Fix issue where widget resize frame overlaps widget (issue 6493388)

* commit 'be8aa3a8093f541402eded22e84b05ed0768e5b2':