Merge "Fix some missed frame reporting issues"