Merge "Ensure we don't wait for VSync if we're just resuming" into devel/master