Merge "Fix frame numbering regression."