Merge "Fix ServiceNotFoundException when face/fp feature not available" into main