Merge "Fix failures in TV frameworks" into main