[[ Bug 12495 ]] Fix windowshape rendering and update issues.
Merge branch 'bugfix-12495' into develop