Merge "Make Adaptive Haptics Scaling Linear" into main