Merge "Add Surface::waitForNextFrame" into nyc-dev