Merge "Rename `optedIn` to `overridden` for game modes"