Merge "Fix getting CONTEXTHUB_SERVICE throws ServiceNotFoundException" into main