Merge "Remove the implementation of deprecated ContextHub APIs" into main