Merge "Remove ComponentCaller constructor from the public APIs" into main