Merge "Revert "Fix window transformation related issue""