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