Merge "Don't count frame drops after resuming from a pause as a video freeze" into main