Merge "Install test app2 per test class for HostsideConnOnActivityStartTest" into main