Merge "Added Remove shortcut Dialog UI" into main