Merge "Call getSensorProps only after filtering" into main