Merge "Camera: Remove code for feature_combination_query" into main