(cherry picked from commit b0a0253e)

Conflicts:
	vcl/source/window/window.cxx

Change-Id: I8330b7361dfdd9f291babb2e49d59ddeb91f5e35