Merge "Do not do setSurface on window size changes"