Merge changes from topic "am-87ba0bd5a0544be995d83469f712674f"

* changes:
  [automerger skipped] Merge changes If537a25e,Iee14d6ee,Iac718a6a,I0aae9bb4 into tm-qpr-dev am: 36a9b7e4 am: c2bd56b2 -s ours
  [automerger skipped] Override config should trigger intervention ignoring opt-in info am: 5abb52c1 am: 57c29409 -s ours
  [automerger skipped] Guard the mode configs map in GamePackageConfiguration with lock am: 1ddd0c1b am: 7b3207a2 -s ours
  [automerger skipped] Check if it's game package before updating configs am: 8e04d2c1 am: 66e8cf3f -s ours