Merge "Add haptic feedback to rotation button"