Merge "Fix window transformation related issue"