Merge "Performance regression on window switching"