Merge "Added Dialog for Shortcut Customization" into main