Merge "Added Reset button for customization mode in shortcut helper" into main