Merge "Use saved window surface to start entering animation"