[[ Bug 12495 ]] Fix windowshape rendering and update issues.