Merge "Camera: Add ability to match surface usage bits" into main