Merge "Add scale factor field to HapticScale" into main