Merge "Fix issue #5384631: hw windows not resizing correctly"