Merge "Get basic tests working with ActivityScenario and manifest" into main