Merge "Camera: Remove flag annotation for feature_combination_query" into main