Merge "Reevaluate game service when provider changes" into tm-dev