Merge "Camera: Correct partial result entry count query" into sc-dev