Merge "Fix MandatoryStreamCombinations for ultra high resolution sensors"