Merge "fix 3049894: Require fiddle or longer timeout for subsequent page flips"