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

* commit '80e055ee81173b554b19d6c8076d602668648445':