Merge "Allowing ProxyActivityStarter without result." into main