Merge "Add option to filter custom shortcuts" into main