Merge "Remove deprecated methods from AppFunctionManager and AppFunctionService." into main