Merge "Only requantize sensor max range if significant" into sc-dev