Merge "Fix Design test on TV" into nyc-support-25.1-dev