S63921: consolidating Beta Track toggles, part 2