Merge "Disables warning dialog when hardware shortcut enabled on purpose" into main