Merge "Refactor animation out of WindowState."