Merge "Add support for manifest based opt-in for game modes" into sc-dev