Merge "[Catalyst] Add flag for Tether screen 25q3 release" into main