Merge "Always use the legacyActivityStarter until new version is implemented" into main