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

* commit 'f2bf2bec47609b0dbcd454c2fc32d420d642004f':
  Fix issue #5384631: hw windows not resizing correctly