…ct_to_use_activity_and_gameactivity

[UUM-20370] Update the project to use both Activity and GameActivity