Merge "Add magnification edge haptic feature." into main