Merge "Revert "Added Remove shortcut Dialog UI"" into main