Merge "Add previewDisplayId to SensorProps" into sc-dev