Merge "fix an issue where the screen could be stale after a surface size change"