Merge "Camera: Support feature combination query without surfaces" into main