Merge "Added UI for displaying existing custom shortcuts" into main