Merge "Fix haptics scaling to match VibrationEffect function" into main