As you said USCIS tried to address this recently, during Trump administration, but it as far as I remember it was overruled and the law stayed the same as it was for D/S. Here is what I found online.
“On February 6, 2020, the U.S. District Court for the Middle District of North Carolina issued a permanent nationwide injunctionblocking the August 8, 2018 USCIS policy memo that sought to change how days of unlawful presence are counted following a violation of F, M, or J nonimmigrant status. The court's order states:
On July 31, 2020 DHS filed a motion to dismissits own appeal of the lower court's decision. The appeals court granted that motion and dismissed the appeal on August 3, 2020.
USCIS has returned to applying prior policy guidance based on its unlawful presence memo issued on May 6, 2009. Under that prior policy, individuals admitted for duration of status do not begin accruing unlawful presence until an immigration judge finds a status violation in the course of an immigration proceeding, or an immigration officer finds a violation of status in the course of an application for an immigration benefit.”